From 4630182ec4f167cf633295ab20e20c7f5d2b8cb6 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 11 Oct 2008 03:37:47 +0000 Subject: [PATCH] =?utf8?q?Bug=20555676=20=E2=80=93=20gtk=5Fwidget=5Freal?= =?utf8?q?=5Fgrab=5Ffocus=20assumes=20toplevel=20=3D=3D=20window?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gtk/gtkwidget.c (gtk_widget_real_grab_focus): Actually test for GTK_IS_WINDOW *and* GTK_WIDGET_TOPLEVEL svn path=/trunk/; revision=21631 --- ChangeLog | 7 +++++++ gtk/gtkwidget.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 859d0ef78b..a9905f847c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-11 Christian Dywan + + Bug 555676 – gtk_widget_real_grab_focus assumes toplevel == window + + * gtk/gtkwidget.c (gtk_widget_real_grab_focus): + Actually test for GTK_IS_WINDOW *and* GTK_WIDGET_TOPLEVEL + 2008-10-10 Behdad Esfahbod Bug 551355 – [PATCH] Make glib build with libtool 2.2 diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f5b2fd18cc..1905c41734 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -5096,7 +5096,7 @@ gtk_widget_real_grab_focus (GtkWidget *focus_widget) * be set by the next loop. */ toplevel = gtk_widget_get_toplevel (focus_widget); - if (GTK_IS_WINDOW (toplevel)) + if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel)) { widget = GTK_WINDOW (toplevel)->focus_widget; -- 2.30.2